Auto merge of #1189 - alexcrichton:issue-1185, r=huonw
authorbors <bors@rust-lang.org>
Mon, 19 Jan 2015 02:53:02 +0000 (02:53 +0000)
committerbors <bors@rust-lang.org>
Mon, 19 Jan 2015 02:53:02 +0000 (02:53 +0000)
commit06ae4bbcbb057239983544f7a9c920f45c432f74
tree06084be6f7bc3ee25f5e06b719925a790e056213
parentd100bef931843fcee27bfb76655d8952857e5553
parent47886a8bd59490095c5768bb7583a20fffd013a8
Auto merge of #1189 - alexcrichton:issue-1185, r=huonw

Closes #1185